merge trunk
authorKenichi Handa <handa@m17n.org>
Sat, 2 Oct 2010 01:21:42 +0000 (10:21 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 2 Oct 2010 01:21:42 +0000 (10:21 +0900)
commita0b06f1f6eaa72b02d8cfa046a95e07a6e97a4c2
treed874259e71c3ae35e3b253fa8e753235ed66e359
parent7d2943ef77a2d72aab7d2cfe14e3033dd7161818
parentcec978fbc99e5165ede32174a8f22dd0cb749256
merge trunk